From 03adeecfa38b0688c001b33054e468da3c184217 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 4 May 2023 06:53:35 -0400 Subject: [PATCH] Add generous waits These tests work in the smae container locally. Perhaps this is down to timing? --- testsuite/headless/headless-input-tests.py | 3 +++ testsuite/headless/headless-monitor-tests.py | 4 ++-- testsuite/headless/run-headless-monitor-tests.sh | 6 +++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/testsuite/headless/headless-input-tests.py b/testsuite/headless/headless-input-tests.py index 6f0407683f..37461eddbe 100644 --- a/testsuite/headless/headless-input-tests.py +++ b/testsuite/headless/headless-input-tests.py @@ -446,8 +446,10 @@ def dnd_tests(): pointer_move(-100, -100) launch_drag_source('abc') + wait(100); pointer_move(100, 100) + wait(100); button_press(1) expect_button_press(button=1, x=100, y=100, timeout=300) # need to wait out the MIN_TIME_TO_DND @@ -457,6 +459,7 @@ def dnd_tests(): expect_drag(timeout=1000) launch_drop_target() + wait(100); button_release(1) expect_drop('abc', timeout=200) diff --git a/testsuite/headless/headless-monitor-tests.py b/testsuite/headless/headless-monitor-tests.py index c556a7bb92..a82cea0fd8 100644 --- a/testsuite/headless/headless-monitor-tests.py +++ b/testsuite/headless/headless-monitor-tests.py @@ -147,11 +147,11 @@ def run_commands(): launch_observer() add_monitor("0", width=100, height=100, scale=1, freq=60) - expect_monitors_changed(0, 0, 1, 1000) + expect_monitors_changed(0, 0, 1, 5000) expect_monitor (position=0, width=100, height=100, scale=1, freq=60000) add_monitor("1", width=1024, height=768, scale=1, freq=144) - expect_monitors_changed(1, 0, 1, 1000) + expect_monitors_changed(1, 0, 1, 5000) expect_monitor (position=1, width=1024, height=768, scale=1, freq=144000) remove_monitor("0") diff --git a/testsuite/headless/run-headless-monitor-tests.sh b/testsuite/headless/run-headless-monitor-tests.sh index d2944e80a2..b217346ab0 100755 --- a/testsuite/headless/run-headless-monitor-tests.sh +++ b/testsuite/headless/run-headless-monitor-tests.sh @@ -11,9 +11,11 @@ export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)" pipewire & pipewire_pid=\$! +sleep 2 + wireplumber & wireplumber_pid=\$! -sleep 1 +sleep 2 # echo DBUS_SESSION_BUS_ADDRESS=\$DBUS_SESSION_BUS_ADDRESS # echo WAYLAND_DISPLAY=gtk-test @@ -21,6 +23,8 @@ sleep 1 mutter --headless --no-x11 --wayland-display gtk-test >&mutter.log & mutter_pid=\$! +sleep 2 + export WAYLAND_DISPLAY=gtk-test export GDK_BACKEND=wayland -- 2.30.2